Revision: bazaar--cached--1--patch-5
Archive: aaron.bentley@utoronto.ca--baz
Creator: Aaron Bentley <aaron.bentley@utoronto.ca>
Date: Sun Dec 19 16:20:51 EST 2004
Standard-date: 2004-12-19 21:20:51 GMT
New-files: po/.arch-ids/ca.po.id po/.arch-ids/cy.po.id
    po/.arch-ids/da.po.id po/.arch-ids/es.po.id
    po/.arch-ids/es_ES.po.id po/.arch-ids/fr_FR.po.id
    po/.arch-ids/nl.po.id po/.arch-ids/pt_BR.po.id
    po/.arch-ids/zh_CN.po.id po/ca.po po/cy.po po/da.po
    po/es.po po/es_ES.po po/fr_FR.po po/nl.po po/pt_BR.po
    po/zh_CN.po
New-directories: .arch-ids
Renamed-files: commands/star-merge.c commands/merge.c
    commands/star-merge.h commands/merge.h
    tests/test-star-merge.sh tests/test-merge.sh
Modified-files: commands/cmds.c commands/lint.c
    commands/lint.h commands/merge.c commands/merge.h
    commands/missing.c commands/status.c
    libarch/archive-pfs.c libarch/merge-points.c
    libarch/merge-points.h libarch/patch-logs.c
    libarch/patch-logs.h libarch/pfs.c libarch/pfs.h
    libarch/star-merge.c libarch/star-merge.h
    libawk/associative.c libawk/associative.h
    libawk/relational.h tests/Makefile.in
    tests/jane-and-foo-do-hello-world-1-baz.sh
    tests/jane-and-foo-do-hello-world-1.sh
    tests/jane-and-foo-do-hello-world-2.sh
    tests/test-merge.sh tests/test-tag.sh
    tests/test-tree-version.sh
New-patches: aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-5
    aaron.bentley@utoronto.ca--baz/bazaar--smallstuff--0--base-0
    aaron.bentley@utoronto.ca--baz/bazaar--smallstuff--0--patch-1
    ds-arch@digital-scurf.org--laptop-2004/bazaar--devo--1.1--base-0
    ds-arch@digital-scurf.org--laptop-2004/bazaar--devo--1.1--patch-1
    ds-arch@digital-scurf.org--laptop-2004/bazaar--devo--1.1--patch-2
    jblack@gnuarch.org--2004/baz--diffsnotdiff--1.1--base-0
    jblack@gnuarch.org--2004/baz--diffsnotdiff--1.1--patch-1
    jblack@gnuarch.org--2004/baz--relint--1.1--base-0
    jblack@gnuarch.org--2004/baz--relint--1.1--patch-1
    rob.weir@canonical.com--2004-public/baz--bug4706--0--base-0
    rob.weir@canonical.com--2004-public/baz--bug4706--0--patch-1
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-44
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-45
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-46
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-47
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-48
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-49
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-50
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-4
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-5
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-6
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-7
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-8
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-9
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-10
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-11
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-12
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-13
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-14
    thelove@canonical.com/bazaar--devo--1.1--patch-54
    thelove@canonical.com/bazaar--devo--1.1--patch-55
    thelove@canonical.com/bazaar--devo--1.1--patch-56
    thelove@canonical.com/bazaar--devo--1.1--patch-57
    thelove@canonical.com/bazaar--devo--1.1--patch-58
    thelove@canonical.com/bazaar--devo--1.1--patch-59
    thelove@canonical.com/bazaar--devo--1.1--patch-60
    thelove@canonical.com/bazaar--devo--1.1--patch-61
    thelove@canonical.com/bazaar--devo--1.1--patch-62
    thelove@canonical.com/bazaar--devo--1.1--patch-63
Summary: Merge from thelove
Keywords: 

Patches applied:

 * aaron.bentley@utoronto.ca--baz/bazaar--smallstuff--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-54

 * aaron.bentley@utoronto.ca--baz/bazaar--smallstuff--0--patch-1
   defined anything with : before / as a non-local path

 * ds-arch@digital-scurf.org--laptop-2004/bazaar--devo--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-53

 * ds-arch@digital-scurf.org--laptop-2004/bazaar--devo--1.1--patch-1
   Merge from thelove@canonical.com/bazaar--devo--1.1

 * ds-arch@digital-scurf.org--laptop-2004/bazaar--devo--1.1--patch-2
   make .listing in top level include .archive-version in all cases

 * jblack@gnuarch.org--2004/baz--diffsnotdiff--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-56

 * jblack@gnuarch.org--2004/baz--diffsnotdiff--1.1--patch-1
   Fix baz changes to use baz diff instead of diffs

 * jblack@gnuarch.org--2004/baz--relint--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-56

 * jblack@gnuarch.org--2004/baz--relint--1.1--patch-1
   Baz lint returned

 * rob.weir@canonical.com--2004-public/baz--bug4706--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-59

 * rob.weir@canonical.com--2004-public/baz--bug4706--0--patch-1
   Remove the --merges option from missing, since it does nothing (#4706).

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-44
   merge from thelove@canonical.com/bazaar--devo--1.1

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-45
   merge from ds-arch@digital-scurf.org--laptop-2004/bazaar--devo--1.1 - fix .archive-version presence in .listing on ftp servers

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-46
   add welksh and spanish translations

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-47
   update es translation

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-48
   merge from thelove@canonical.com/bazaar--devo--1.1

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-49
   Merge in latest translations : Catalan, Chinese, Danish, Dutch, Frence, Portuguese, Spanish

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-50
   fix up the es_ES template

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-4
   first cut graph merge operator in star-merge. leaky, but optimiseable

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-5
   remove unneeded join-branches

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-6
   implement basic trace functionality for merge.

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-7
   change smart merge algorithm to generate minimum depth intersection of patch logs

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-8
   teach merge to really use one of the best merge parents

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-9
   rename star-merge to merge

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-10
   remove a non needed helper function

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-11
   code cleanups for star-merge.c

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-12
   begin per-tree patch looks for uncommitted merges, and fix handling trimed patches

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-13
   merge from thelove@canonical.com/bazaar--devel--1.1

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-14
   merge from the current state of the 'this' tree, not the last committed state

 * thelove@canonical.com/bazaar--devo--1.1--patch-54
   Added Arch Cache support

 * thelove@canonical.com/bazaar--devo--1.1--patch-55
   Consider all paths with ':' before '/' to be non-local

 * thelove@canonical.com/bazaar--devo--1.1--patch-56
   merge from ds-arch@digital-scurf.org--laptop-2004/bazaar--devo--1.1 - fix .archive-version presence in .listing on ftp servers

 * thelove@canonical.com/bazaar--devo--1.1--patch-57
   Clearing up reject blocker on undo

 * thelove@canonical.com/bazaar--devo--1.1--patch-58
   Baz Lint readded (fixes 4655)

 * thelove@canonical.com/bazaar--devo--1.1--patch-59
   add welksh and spanish translations

 * thelove@canonical.com/bazaar--devo--1.1--patch-60
   update es translation

 * thelove@canonical.com/bazaar--devo--1.1--patch-61
   Remove the --merges option from missing, since it does nothing (#4706).

 * thelove@canonical.com/bazaar--devo--1.1--patch-62
   new merge algorithm that deals with tags and cycles more sanely that star-merge

 * thelove@canonical.com/bazaar--devo--1.1--patch-63
   Merge in latest translations : Catalan, Chinese, Danish, Dutch, Frence, Portuguese, Spanish

